(turn-on-font-lock): Test window-system.

diff --git a/lisp/font-lock.el b/lisp/font-lock.el
index 8121b406979feb788e38e4f7caa2e26d72637860..ff0ede34e6ea5734713cbed4c46b448946c7e779 100644 (file)
--- a/lisp/font-lock.el
+++ b/lisp/font-lock.el
@@ -411,8 +411,9 @@ syntactic change on other lines, you can use \\[font-lock-fontify-window]."
 
 ;;;###autoload
 (defun turn-on-font-lock ()
-  "Unconditionally turn on Font Lock mode."
-  (font-lock-mode 1))
+  "Turn on Font Lock mode, if the terminal can display it."
+  (if window-system
+      (font-lock-mode 1)))
 
 ;;;###autoload
 (defun font-lock-fontify-buffer ()